fuji: cleanup to refactor into rootdir

Change-Id: I44c65c8bb0a977ce87ebb9cdb78a9366a8709a01
Signed-off-by: Arnav Gupta <championswimmer@aokp.co>